Couple of runtime fixes for nterp. am: 3bae047186

Change-Id: Ia100bbe95a931bf0d02f1db215ea6dc6af2e1ecd