Minor Fixups