Use correct ordinal value, further fixes and refinements