some trivial fixes