#288 fixes after review