Fixed a couple of notification issues