Apply minor fixups