Minor bugfixes.