Corrections and addition to new wrappers.