qa: some fixes