Fixed some issues after conversion from mercurial