#271 fixes after review