Fix alert issues

Signed-off-by: Prashant Shah <pshah.me@gmail.com>