Clean code. Add fix for new version of uuid.