Minor changes to aid in pathing in our cluster