Fix for phone number picker
Fix notifications