Some fixes for Security UI