More fixes for GTP v5.0.
Note class described by comments. Version changed.