#Minor bugfixes.