ORS->ORSX, engine tweaks