PLATFORM-364 Fix build errors