fixes for GPPLATFORMCORE-31