Tweak payload generation further
1.2.2