Some final QA tweaks.