Further tick improvements