fix for moved interfaces
7 files changed