Enhancements & Bug fixes for Secure Gateway Server