CTT: daily update. fixes for defects