Fixes to make post-easter stff work properly.