Update to UUIDs + fix some npes