Fixed Geometry99 merge conflicts.
Updated builds.