[Radu, Andrei] small fixes