More args.length fixes