Fix notifications and other stuff