Fix interface imports