Fix some other warnings.