Fixing some stuff up in the wrapper api.