Update default.xml

Fix build errors, remove "kumajaya" conflicts