Fixes for WSA Security dashboard