Some bug fixes
Bug fix in Push Notification