UUID bug fix and some pmd fixes.