Fixing a few bugs and issues especially with sonicwall