Reworked Secure Boot patches