More count tweaks.