Fix ambiguity warnings for real this time