Formulation fixes