Fixes to registration uuid