[vardtc missing] performance fixes