Fix variable paths