Fix files issues