NEXT: Properly fix Intrinsics