Fixed small issues with the statemanager