a few fixes related to ticks changes