More SHWrapper changes