… and even more bugfixes