Some Fixups