Fix some more wrappers