Fix entity services