Fixes with interfaces Part1