more hacks which fix stuff pending an upgrade