Work on notification handling and fix subscription registration