Merge "Fix build warnings in fir"