Fix interface problems and use statements