Fix interface references