- Minor fixes for ARGC/ARGV