Fixing parameter issues found in GPPROTO-4 and GPPROTO-5