discussion: fixes