Minor hotfixes.