Two minor hotfixes