gui + server fix