Second stage tweaks