Vivtc leaks

These shouldn't be delayed until I get my shit together in #78.