2013-05-23: fixes proposed by golem.de