Vcgen fixes

Fixes for CpSc 372