Minor changes to fix issue with classloader problems in netbeans.