Add build.xml fixes
Commit fixes during release of b1