Fixing some issues with alerting
v0.4!