Made some small tweeks to make compatible with new home in git