Fixed some parameterization issues.