Minor adjustments to wrapper