minor changes found in merge