Fixed a few path issues