Fix server core

Fix server core...