fix default.xml and fix