miscellaneous fixes (see comments) re #3606

git-svn-id: svn://develop.studip.de/studip/trunk@27341 c5b85792-5220-0410-ad23-ed5b6b8ad999