Fixed a couple of namevar param errors from merge.