Yet some bugfixes.