Fixups and style