Fix a few logical bugs, and switch to Drained/Retiring state/activity