Added some path modifications from stallman