More nitpicking, fixing, etc.