extend_invoke: small fixes