Some follow-up fixes for the JB notifications