Bug fixes for Push Notification