Kleinigkeiten

Change-Id: I2c0e5b2c570a48568671040cad902ba58d477512