Fixed more intrinsics