Fixes to cheri_invoke.S