Updated for i2catVM - appears to be functional (for now)
Also minor update for univbrisVM