minor wrappers changes