fix some trivial issues