Minor, fixes after review