Fixup some minor things