Fixed up the build to be x86.
Fixed bug related to latest Glue changes.