Minor wrapper updates