Move forward some fixes from 1.11.8