Some minor runner-up hotfixes.