corrections after master=>3.0