Vuln fix misc 3

This Pr include a number of miscellaneous bug fixes based on the GEM Vulnerability Database & GUI Google document.  
Add a note or delete the commented line, please.