Fix some type warnings.