The only really pain on my 2016 X-Trainer has been the kickstand bolt always coming loose. Tried several types of locktite, no luck.
Plus the bolt hole was getting egged shaped since it was a steel bolt riding on a steel hole.
So I reamed out the hole to .4700" (just a touch under 12mm), and installed a sleeve bushing bought at McMaster Carr (PN 6679K35, about $3.50).
So now the kickstand is nice and tight, plus its riding in a replaceable bushing. Additional I drilled a small hole for .032" safety wire and wired up the bolt to the kickstand return spring bolt. So hopefully this will solve both problems.