Tvapi optimizations to release