Make some fixes after review