Fix up argument numbers