Defect Fixes

Fixed a couple defects.  Info recorded in defect tracking log.