Finish fixing the merge with master