changes for git compatibility