More UUID updates

Hopefully the last commit, before we release a new version.

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