Fixes to make @parkr smile.