More fix-ups