tiny fixes after rebasing on master