Even more build / classpath fixes by @Maescool