Fix notification handling for 4.3