Fix some payloads issues
Fix some payloads issues