First stage tweaks