Added new fixes for QA part3.