Fixed the warnings for withUuid