various tweaks to make it all work and path properly again