Fix various broken interpolations

Fixes #699