Classpath fixes to build the project using the r22 tools