Finalize the UEFI and Udisks2 modifications