added some hotfixes