Fixed server crashes