[SG-96] General fixes