fix various paths