Continued fixes for UUIDs