Improving some notifications