Post-merger fixup of TickHandlerServer