Reinstall fixups
Add tpm support