Fix bugs caused by an EGit update