Some bug fixes around Splice notifs