Small interfaces fixes