Improved local notification handling