generator fixes for VarDec