More bugfixes.
More bugfixes.