Further bugfixes.