Fixed server building