More fixes for TWBS 3.0