Add the missing UUID tools
Some stupid cleanups