fix compile
remove now redundant wrapper
fix typo