small hotfixes.