twbs2 to twbs3 fixes