Additional fixes to get back to original AppxPackage object