Fix some path stuff