Some hotfixes