More fixes for fbc git compilation errors.