Fixes on classpath