fixing paths, class names and warnings