Various hotfixes