banner and diff fixups