More fixes for g4py requested by Thomas.