More fixes for Gen2 script