Alert fixes