#425 fixes after review