Merge: Fixes for supercalls