Bring over a couple little things from master...

Bring over a couple small things from master into 2.1.