Manually merge a couple other fixes from 3.0