Payload plist fixes