Fixed UUID errors
Fixed UUID errors
Fixed errors, existing since library-updates