Some path adjustments