Fixing class paths