INterface fixes