Added new fixes for QA part2.