Fixed some path dependency problems