Fixes to push notif