Fixes to state tracking