Resolves all outstanding issues with paths