Fix a couple of classpath issues