Some Bugfixes from mantis.ilias.de