Some more interface fixing