Modified make_final to include *some* packages added by SWE3.1-gamal