Some Fixes on the Interfaces