Merge pull request #906 from jtwigg/develop

A Few Fixes.
don't pull UUID's Zero.