forward-porting items from 1.1 to master

Cleaning up things we've been putting off forward-porting