small hotfixes