Improvements to UUID use.