opmapi.h fixes.
(cherry picked from commit 33cd049d72ef5b5eae897e1e513e6b1b3b0432c6)