some small hotfixes