#221 fixes after review