Update default.xml

Misc updates to correct build errors