Tick Handler tweaks