some concept fixes