v2.0 fixes from v2.1