#433 fixes after review