[OE-4050] Latest set of tweaks.