Some more fixes for UUID handling, to allow use of Base64 encoding as well