Fixed up pathing functions