Fixed some ambiguous occurrences