Fixed wrappers bugs