Minor bugfixes related to previous changes.