rest fixes