Bugs in interstitial generation fixed