State fixes