Final nitpicks from Mark