r162: Minor bugfixes: