Small counter fixups