uuid4 and fixes