Iniital pre-reg tweaks