Fix a bunch of wrappers