Fixing issues posted by Anil/ Tess on Asana.