Fix bugs for QA review