Tweak first run and loading behaviour