services fixes