A couple of bugfixes to last changes.