#25 fixes after review