Fixes from CH13