Assembly hotfixes