Fix control server/client