Bug fixes from the cygnus app.
Merge pull request #1214 from AnalyticalGraphicsInc/bugFixes

Bug Fixes