Modifications in support of GatAga improvements.