Changed orderings and trying to fix bugs in WiX