[PLAT-3044] Temporary fixes