changes to make things work with build.xml