Fix differences for merging with master