More count optimisations