U.S. GS3 Compile fixes