Fixed some classpath issues