Changed some classpath kram