[FCS-35] Small fixes