Fix Wrapper static errors