Finally fix compat, I've been silly with UUIDs