High level API fixes