Fix minor issues due to structure update
Set uuid string as alias