Fix ambiguous implicits on 2.11.x.
Backported 2.11.x compatability fixes.