fix some unexposed names