Fix compiler warnings
Updated build generator
Bug fixes
Regenerated build/