servr - fixes