Changes by Priyanka for QA fixes