A few fixes after review