More arg fixes