Fixing some count stuff