Fixes on the interface