Fix ordinals for 21-23 and 31