Fix build_args logic