More bugfixes :-)