Tweaks to state loading mechanics