Harmonizing some cases in the form