Satisfying remaining QA issues