Fixes for client QA