Few changes to comply with twbs 3.0.0