Fixing few minor grep issues + adding firewall check