Some more fixing up