Fixed some path bugs