Removed notification bugs