Added checks for ambiguity after types resolved