Fix some pathing issues