Quick counter fixes