corrections related to last merge