Fixes needed to support the new configuration framework and change of parameters