fixes after port to GIT