[unity] Some fixes