Fixes merged in from 3.0