Bug fixes and enhancement for classpath and build scripts.
Thanks to Niels Bertram this work.