Further interp fixes (WIP)