Modify creation of context, fix return address saving in CCall