Fix some bad state reporting (misnamed vars)