Fixes issues with UUID fetching