PayloadParser fixes done