Some more fixing up.