minor mods for QA