Even more bugfixes