Preparing for the High-Luminosity Run of the LHC