Bug fixes
Fix build generator
Regenerated build/