Fixed server issues!