A couple small changes to the path builder. It shouldn't break anything,
hopefully.