Various 2.0 fixes