More UUID stuff

Some more improvements for working with the new system.

Signed-off-by: FroznMine <pesafrre@arcor.de>