Added some extra little fixes to build.xml