Added new fixes for QA.