[UNITYSDK-210] Changes requested by clint