Next step fixes