Fixing paths...