fix some path issues
;