A few bugfixes from rel 1.9.0.