More Fixups