Updates to sync with changes in upstream.