Fix path adjustments