Tweak setstate updates