Fix up some path stuff