Fix Problems That Block Uninstall