Ammends some fringe scenarios with state keys and states