Fix a bunch of old features