Replaced and fixed files