More nitpicks