Fix interface refs ##