Fixed a couple of bugs in ParameterOptimizer.