Corrections to ConnectionWrapper