MANTA-28 final assembly tweaks