Topic/misc fixups