Fix issues after QA