Fixed some servercode