fix mousetrap and wrapapp apis