bugs: QA fixes