Small inferface fixes