More bugfixes.