Bug fixes and ant adapter