fixes for GPPLATFORMCORE-33