Fixed a bunch of cases where we were internally linking to a hash that didn't exist