Even more bugfixes.