Fixup minor errors