Fixups

Some fixups that I'm going to merge immediately