Update deps.
Fix #1503, Fix #1504.