Tweak the script a bit with some idiosyncrasies from fixing wrappers