First fixes after review