Fix number of arguments issue for non-scratch builds