Fixes for buils.xml