High Level API fixes #3