fixes + server