Bugs fixed from QA test