Fixes for twbs update