updates to work with latest upstream