Update to be compatible with latest upstream