fixes from QA