some hotfixes