MFH: r370222

Fix plist
MFH: r370389

Fix packaging
MFH: r370229

Fix packaging