Resolve Notification Issues & Other Issues