Final fixes ...

... seriously, Matze?