Fixing some small path issues