Google issues

Fix some details about the data sent to the CAP