Fix asserv (work in progress)