[PLAT-3186] Miscellanous performance tweaks