Some small hotfixes