VWHL, THTracker: Adjusted to new API