Cleanup settings.xml
Cleanup minor build errors