Roll in changes from 2.1.1 (improved somewhat)