Different bugfixes