Fix a number of "too-specific" versions