Small fixes for Ambiguity resolver