Improve notification registration and cleanup + fix removal of site questions.
Build fixes.