Addressed last few notes from QA.