Fixes: alert handling, import in shveta's PR