Fixed the helpers and the interfaces.