modules / rest fixes