General fixup of lots of little issues