class path fixes