Small fixes for notify