#162 fixes after merge