Fixed a couple of parameter name conflicts