More fixes in serverbase