Ordos and SoO fixes & refined