Attempt to fix serv problems