Misc fixes due to failing tests
Merge branch 'master' into feature/ant-task-updates