Fix compiler errors for non-default configurations
Regenerated build/