Fixes after review with Mato.