Begin fixing paths, etc.