Fixes in launcher classpath etc