While already at it, just a few trivial fixes. Change 1/3 and 2/3 are basing on recent added files. jbe