PRD-4921 - Minor Excel performance tweaks