Some more bugfixes.