Variance fixes

Fixes for variance bugs (mostly)