Some argv fixes