Cleaning up path issues