Fix a few bugs, and get agreement again