Fix same erasure warnings/errors.