Minor fixes after review