Fixed errors in server