Some changes because of cp failure in script