[github] fixes after merge upstream