Patch UUID processing (Fixes #92)