Fixed a few methods not using UUIDs when they should be