Some more tweaking of paths and such