Clean up and fix path issues