fixes for GPPLATFORMCORE-30 , GPPLATFORMCORE-34, github/5