More tweaks, not done with OptimizerSystem