couple of QA-specific tweaks