Fixes for Alert, safer impl