Fixup and document API