[PLAT-5985, PLAT-5986] Fixing build (Jim)