making fixes for new version of RSDK