1.7 update - Fix tick handlers.