Fix for build xml - correct dependency order