Finish fixing wrappers - it compiles now