Fixes from QA.