Some interfeis fixes