Misc counter fixes