Fix interface changes