Fixes for uuids