ANT & small bugfix