Additional fixes after review