Fix some CFI issues in x86_64 assembly