State fixes in the core