updates to fix issues with wrappers