Fixed more alert bugs