Reassembling your machine during and after refurbishing various parts, is always more pleasurable when the old, corroded fasteners are renewed, preferably with the correct specification OE factory supplied parts like this M4 x 16 Tapping Screw.
Same screw, different finish: