Fix race condition in @if
Fix double intrinsics bug