Last minute bugfixes.