Even more ORS tweaks