Make notifications work right