hotfix + cleanup alerts