fix things that got broken on last 'merge upstream/master'