Error hotfixes