Bug Fixes

Bug fixes from the Cygnus app.