Minor changes to the many wrappers.