added some trivial fixes