Update some builder paths to be sensible.