fix ambiguity warnings

whoops. I missed them in #6830