Minor bugfixes for a line in viewer_manifest that never gets run (because of the way the SConstruct file on Linux is built).  However, it might get run in the future, so there we go.  Thanks cg for finding this.  Not reviewed.