Minor changes to util due to classpath issues