Michal: "fix a few places"