Some other hotfixes