Further classpath tweaking to try to improve build reliability.