[PATCH Audrey 0/2] Two bug fixes for Configserver