Few fixes on server after test with table