a few minor fixes ....