Callback fix

Use the stack pointer for the location of the callback address. This
bypasses the stack alignment issue.
Fix copy/paste error in last push