Again some bugfixes.