Small corrections after rework (source: bugs.txt)