fix QA Analysis issues