fixes after merge with upstream