Fix serverdb issues