Fix compiler errors for non-default configurations
Regenerated build/
Merge pull request #1865 from sjinks/compiler-errors

Fix compiler errors for non-default configurations