Small updates in preparation for landing this.