Update uuid patches
Fix #469