minor fixes to have less stale bad state and less logging