Refactor alerts
Misc. fixes