Identity coercion from UU to Type and other improvements