Merge "FM: Fix compilation errors"