Small improvements for QA