Further count improvements