minor fixes in several files