fix some more calls