Additional clean-up after merging upstream/master