Tweaks to state