Fix some notification stuff