Updates to work with latest upstream.