slight fixes to wrappers