Minor changes to thread & classpath