Various dep upgrades, close #1483