Mostly OnTick fixes