Martin Rotter A couple of fixes.