fix trivial issues as I see them