2.0.9 Fixes

Assorted fixes from 2.0.9