default.xml minor fixes and script adjustments