Some cleanup of paths..