Update default.xml and fix end of line