Fix some interpolation issues (still broken).