Fixed FS server
Updated FS impl