#360 fixes after review