Alert state change fixes