Fixes to the rest of the GP4 format failures