More argument fixes