ordinal fix, other fixes