High level API fixes #2