various fixes

  Defect Number:
    Reviewed By:
   Testing Done: