coupla bug fixes
hopefully works, build.xml is freaking out