And yet again some bugfixes