Stable 2.0 fixes