class name, and relative path fixes