Various tweaks to repo options