Cleanups and Status Bar notification count fix