Some fixes after review