Other bugfixes