Fixed all alerts