r9190: few bug fixes