Review fixes for pathing