class_path fixes