Correct paths
clean up