Fix #1921
Fix compiler warnings
Regenerated build/