Clean up issues from QA