More fixing for std serv