More twbs 3.0 fixes