A little fixups related to styles and debug output