Final fix-ups