A few more fixes to error IDs.