Fix some pathing bugs