PLATFORM-392 Fix comments