Fix after merges