Changed make_final to better match the build order in SWE3.1-gamal.