Intrinsic types minor work