Remove several compile errors.