Fixed two bugs causing notifications