Some cleanup work

Moin,
some little cleanup which I collected while debugging a UMC-UVMM problem ..
Greetings from all your former colleagues.
Philipp