Merge pull request #502 from Maaack/fix-uid-warnings