Fixed notification & messages count