Fix paths expansion