A couple bug fixes circa transaction_builder