Patched the server and scanner files with latest fixes