1) Fixes for command/notifications handling