Minor hotfixes