Minor GA fixes.