Fix data corruptions