Merge several fixes from the `bdrister` AquaticPrime repo

Using Edovia/AquaticPrime I get a crash here:

    CFArrayContainsValue(blacklist, CFRangeMake(0, CFArrayGetCount(blacklist)), hashCheck)