Fixes handling undefined args
Updated builds.