expression generator fixes