Additional hotfixes