Fix some -Werror errors.