Fix bugs from QA