add some wemac related changes