minor hotfixes