Fixes for cases subscribers/handlers