fixes for GPPLATFORMCORE-25