Added more robust classpath support for Ant projects
Added missing 'final'