Some more state fiddling