Several fixes especially in the uuid adhoc feature