Different bugfixes.