other hotfixes