more fixes for state