Eliminate some more warnings.