Fix trivial issues