Improving a few ambiguous things