Update to match latest upstream