2.1 fixes

Assorted fixes