Yet more (attempted) fixes